Made it compile with clang
Merge pull request #1446 from cedeel/patch-1

Made it compile with clang