Improve dictionary access
Merge pull request #270 from alfaproject/xmldoc_dictionary

Improve dictionary access