changed to java 1.7 compliance