Volumio2 upgrade sleep function

In V2 the Alarm-function is realy great. Just set up the start time and go.

But to stop playing at a set time, this is not so great.
Just one stop/sleep-time.

Could this function be upgraded so we can start - stop at any given time?

when i leave home in the morning, as well late evening when i go to sleep?