Changed syntax to Java 7, updated class Javadocs