migration changes
Merge pull request #24 from j4kobbech/development

migration changes