Add extra time options
Merge branch 'master' of github.com:elyobelyob/event