Updated README.md and javadoc