Merge pull request #1 from nightwalkerkg/master

Java
Merge pull request #3 from randomnnk/master

Merge pull request #1 from nightwalkerkg/master