Updated to build with java 1.7