merge schema
Merge pull request #8 from mwdion/master

merge schema
merged schema again