Updated README and JavaDoc