Addint Java 7 support
initial version