compiles with clang++
Merge pull request #64 from smirolo/master

compiles with clang++