Fixed dependencies, updated code to compile against Java 7.