Merge pull request #92 from juju/bug/schemagen