Updated to phpmd v2