Xml comments update

Rebased #93 to review