Java project
Merge pull request #2 from stryxx/master

Java project