Made it compatible with Java 1.6