Schedule feature

Yeah sure, I would add these changes. Thanks for suggestions.