Code

Merge branch 'cppcheck'