Merge pull request #139 from dejan-brkic/master

Sonar issues fixed