Updated to require java 1.7 (maybe)