8th commit: minor changes, transition to Java 1.7