Fix cppcheck
Fix cppcheck (part 2)
Merge pull request #25 from pavel-pimenov/master

Fix cppcheck