Merge pull request #118 from tribal-tec/master

Fix cppcheck run
cppcheck 1.63 fixes for RHEL6