Merge pull request #60 from eroshenkoam/master

Sonar Fixes