Initial commit
Updated javadoc