PMD fixes
Merge pull request #2 from hgschmie/master

PMD fixes