added schema migration
Merge branch 'issue-2' into merged