Some issues reported by Sonar fixed.
Merge branch 'master' of https://github.com/CeON/CoAnSys
Merge pull request #188 from wosiu/master

cosmetic and issues reported by Sonar