Merge pull request #1 from vanderlin/master

mac