Merge pull request #2 from simar0at/cr-xq

Schemas, ant build