Clang warning fixes
Merge pull request #94 from emoon/master

Clang warning fixes