Now supports java 7 too