Merge pull request #2269 from dellis1972/xmlpeek