Basic skeleton of java client
Merge origin/master