Reformat to java coding standards
Merge pull request #2 from Xezz/master

Reformat to java coding standards