Merge pull request #127 from dejan-brkic/master

Fix Sonar issues