Pretty printing of XML info
Merge origin/development into development