Merge pull request #819 from narfbg/develop-migration

Improve the Migration library