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

Sonar issues