PMD fixes
Merge pull request #11 from hgschmie/master

PMD fixes