fix sonar warnings
Merge pull request #263 from just-boris/master

fix sonar warnings