upgrade to java 7
Merge pull request #89 from metridoc/upgrade-to-java-7

upgrade to java 7