refactor java src
test
refactor
add data
Merge pull request #1 from canadatom/develop

Develop