Forced everything to java 1.6
Updated Version