Merge pull request #187 from wosiu/master

Fixed issue in AND reported by Sonar
Some issues reported by Sonar fixed.
Merge branch 'master' of https://github.com/CeON/CoAnSys