Fixed issues reported by sonar
Added sonar.sh
Merge pull request #49 from jewzaam/sonar-fixes

Sonar fixes