Fix clang compiler warnings
Merge pull request #207 from Chilledheart/develop

Fix clang compiler warnings