PMD fixes
Merge pull request #12 from hgschmie/master

PMD fixes