Initial work on Make Schema
Merge pull request #11 from cadecairos/b861380

Changes to Make Schema