Merge pull request #12 from adam-waldenberg/osx-build-fix

OSX Build Fix