Merge pull request #17 from hgschmie/master

PMD fixes
local fixes