PMD fixes
Merge pull request #3 from hgschmie/master

PMD fixes