Fix OS X 10.9 compiling issues
Merge pull request #15 from dlackty/fix-osx-compiling

Fix OS X 10.9 compiling issues