Merge branch 'macdev'
Merge pull request #1 from immatryitout/1

Merge branch 'macdev'