sonar fixes
Merge pull request #18 from baev/master

sonar fixes