Fixed #41 - Up to Java7
Fixed #41 - Up to Java7 - Eclipse