Removing restriction to Java 5

Closes #1