Java project
Merge pull request #3 from stryxx/master

Java project