Java 7
Merge pull request #168 from miguelfrde/java

Java 7