Merge pull request #133 from arjantijms/pom_versions_automatic

Update versions and automatic module in pom, plus tidying