clang build fix
Merge pull request #1 from newnon/master

clang build fix