* Updated to Java 7
* Refactoring