Merge pull request #25 from deprogram/master

Changes for Mac installer