Merge pull request #34 from AADOJ/Freysi21

Freysi21
Pmd code inspection and problems fixed which pmd pointed out