Start fixing export
Merge branch 'exp' of https://github.com/Alllex/Schedule.git