Fix warnings on OSX compile
Merge pull request #41 from fluffy/cj1

Fix compile warnings on OSX compile