Merge pull request #73 from tuncer/migration