add set_timer
Merge branch 'work'