Changed aroundtime to a time window (feature #1400)

@ProfYaffle & @adamsutton I rebased and cleaned up my version of the patch as discussed in the old pull request.
Which is wrong and misleading, it's a long standing bug that I've noted before, but if you're going to replace this functionality you might as well fix the bug.