Merge pull request #220 from ammachado/xml-doc-fixes

Xml doc fixes