Mavenised and updated to 1.6.4