Merge pull request #12 from ctorstens/development

Development
go back in time to fix migration
Merge pull request #13 from ctorstens/fix_migration

Fix migration