Fix Sonar Issues
Merge pull request #1 from robert87/master

Fix Sonar Issues