Upgrade Java 7 to latest version
Merge pull request #214 from ajardan/master

Upgrade Java 7 to latest version