Merge pull request #572 from micmac1/span3xml2