moving to java 7 and merge test of git :)