Updated README and Javadocs