Fixed versioning and upgraded to java 1.7