Added support for JDK 1.6