Added (incomplete) Java 7 version