Merge pull request #6 from turbanoff/use-java7-features

Use java7 features