Updated licensing
Updated javadoc