Compiles in eclipse with 1.6 compilation
Added JDK 6
Changed instance of to getClass().equals
Merge branch 'feature/java-backwards-compatibility' into develop