FIX: time representation
Merge branch 'master' of github.com:SJakobsen/DIM3-Team-M
Merge branch 'master' of github.com:SJakobsen/DIM3-Team-M