Fix Sonar issues
Merge remote-tracking branch 'upstream/master'
Merge pull request #127 from dejan-brkic/master

Fix Sonar issues