Rep 600

Switched build to building on Java 1.7