Merge pull request #7 from jafyvilla/master

Fix cppcheck warnings
Fix build after cppcheck-related changes