Merge pull request #6 from XhmikosR/cppcheck