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