Last fixes
Merge branch 'migrations' of https://github.com/Locu/chronology into migrations