Fix compilation on OS X / clang.
Merge pull request #1 from anders/master

os x fix