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

Sonar issues fixed