Adapted source code to Java 1.7
Adapted source code to Java 1.8
Fixed Javadoc