Java 6
Merge pull request #65 from miguelfrde/java6

Java 6