merge of pull-request from adangel for PMD4