Merge pull request #42 from hazendaz/master

Update Dependencies
Merge pull request #43 from hazendaz/master

Sonar Cleanup