Fix #257
Merge pull request #258 from jencka/migration

Fix #257
Merge branch 'master' into anna