Fixed Clang warnings
Fixed more Clang warnings
Merge pull request #83 from emoon/master

Fixed Clang warnings