Merged with the previous commit. Added JavaDOC to the UI.