fixing sort, adding time slots
Merge pull request #9 from crebma/master

Fixing sort, adding time slots