pmd-fixes
Merge pull request #11 from hgschmie/pmd-fixes

pmd-fixes