Toolchain XML improvements
Merge pull request #38 from jgranick/patch-3

Toolchain XML improvements