4Evergreen4 Merge pull request #1 from bkudria/osx-support