Fix some cppcheck reports
Merge pull request #79 from serval2412/master

Fix some cppcheck reports