Fix timer reset()
while it is being waited on
#241
Merged
reset()
while it is being waited on
#241