Updating readme and javadoc