add spinner
use input event
increase timeout a bit
Merge branch 'master' into gh-pages