Fixed issues reported by Sonar.
Merge branch 'master' of git://github.com/CeON/CoAnSys