Fixed #85:  Several violations reported by Sonar fixed.
Merge branch 'master' of https://github.com/htmfilho/yougi