Fix compilation on clang
Merge pull request #111 from johnboiles/master

Fix compilation on clang / OSX