Merge pull request #126 from dejan-brkic/master

Fix Sonar issues
Merge remote-tracking branch 'upstream/master'