Update for clang compiler.
Merge pull request #173 from endJunction/clang

Update for clang compiler.