Bug136 timerange

This fixes #136 

It's not a perfect solution for time range handling overall. That would be #153