Work on migrations
Merge pull request #12 from Wuisch/dirk

Work on migrations