Mac fix was in-progress as per issue #39 and halted due to other projects. Other development work and refactoring has since progressed well beyond any point of sane merge/rebase of Mac programming fix feature branch.
Resurrect original work and apply to current system.
