Merge pull request #1 from hgschmie/master

PMD fixes
local fixes