PMD fixes
Merge pull request #14 from hgschmie/master

PMD fixes