fix Sonar issues
Merge pull request #14 from ridoo/master

fix Sonar issues