Java 7
Merge pull request #2 from Jake0oo0/patch-2

Java 7