Merge pull request #899 from arjantijms/tidying_poms

Tidying poms