Merge pull request #14 from oleksiyk/master

Speedup ZSchema