Cargoify expat
Merge pull request #1 from metajack/cargoify

Cargoify expat