Adding Java 7 support
Adding Java 7 support