Add license, correct javadoc
Add license