Merge pull request #13 from insom/improved-migration