Merge pull request #49 from rizarsyi/master

updates
fix some migration
Merge pull request #50 from blackbiron/master

fix some migration
fix migration