Update to Java 7 (issue #23)