adding JDK 1.7 support