Hotfix for cppcheck errors
Merge pull request #81 from tribal-tec/master

Hotfix for cppcheck errors