Upgrade to Java 1.7
Merge pull request #54 from alexist/master

Upgrade to Java 1.7