Fixed build for OSX and llvm
Merge pull request #21 from christkv/master

Fixed build for OSX and llvm