Fixed some incompatibilities with Java 7
Updated the readme