Merge pull request #1 from moostrik/master

mac