Ported project to JRE1.7