Fixes #244.
Adds some tests to validate the behavior.
Merge branch 'master' of https://github.com/wenns/sonar-cxx