JavaDocs added
Merge branch 'sydni-new'