typo
Improved usability
Improved usability again
Finally using Java 7