Merge pull request #222 from Erich-Hauptli/master-next

Garrison-xml Pointer Update