Merge pull request #21 from natano/master

add java