Fixes compile failures on OS X with clang
Merge pull request #70 from wjwwood/osx_fixes

Compile error on OS X