Updated to Java 7.
Added junit dependency for unit testing.