made changes and added migration code
Merge branch 'issue-22'