Updated to Java 7 with <> operator