Fix #68, fix #67
Merge pull request #69 from keenlabs/hotfix/schemamod

Fix #68, fix #67