Added Java 7 Support
Merge branch 'master' into JDK7-Upgrade