Updating to generate for nml2beta4 & to use lates nml2 jar