PMD fixes
PMD and POM fixes.
Merge pull request #10 from hgschmie/master

PMD fixes