Merge pull request #266 from Ephemera/java7

Update java7 to current version