Merge pull request #4 from hgschmie/master

PMD fixes
local fixes