Build fixes for OS X 10.9
Merge pull request #1 from thp/osx-10.9-build-fix

Build fixes for OS X 10.9