Merge pull request #1 from nightwalkerkg/master

Java