Updated README and javadoc