Merge pull request #231 from martinbudden/tidy_sonar3