Update CMake, cppcheck fixes
Merge pull request #16 from tribal-tec/master

Update CMake, cppcheck fixes