sonar fixes
Merge pull request #39 from baev/master

sonar fixes