Merge branch 'rnou/327-add-cppcheck' into 'master'

Resolve "Add cppcheck"

Closes #327

Closes #327

See merge request !214