Fixed PMD errors.
Merge origin/master