Merge pull request #8 from hazendaz/master

Sonar Cleanup