[fix] fix of SONAR violations
Merge pull request #48 from davidmoebius/sonarfix02

[fix] fix of SONAR violations