Merge pull request #17 from lawinslow/master

Fixed mac version not running issue
Merge remote-tracking branch 'upstream/master'