finish migration
Merge pull request #2 from snoweye/master

test