Merge pull request #38 from hazendaz/master

POM Updates / Minor Sonar corrections