Fix Clang warnings
Merge pull request #5 from BardurArantsson/warning-fixes-clang

Warning fixes (Clang)