Merge pull request #3 from hgschmie/master

PMD fixes
tab & checkstyle fixes