Updating time logic
Merge
Merge branch 'compose_branch' of https://github.com/scobb/Impromptu into compose_branch