Version update
Switched to Java 7