Update README doc and JavaDoc