Fixed issue #27
Merge pull request #29 from gaurimishra/migration-fixups

Merging; fixes #27