Upgrading project to compile with JDK 1.7
commiting latest stable code