Fix Sonar issues
Merge pull request #126 from dejan-brkic/master

Fix Sonar issues