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.
As above.