Merge pull request #1 from MarkInNVA/mac

Mac
Merge pull request #6 from MarkInNVA/development

Merge pull request #1 from MarkInNVA/mac