Merge pull request #64 from gary-pei/master

Fix migration