Changed typed schema creation

Closes #78
Merge pull request #79 from Strech/json-keywords-fix

Changed typed schema creation