allow compiling with clang
Merge pull request #507 from satta/clang

allow compiling with clang