Added set timeout
Merged
Switch to own curTime
Merge branch 'master' into gh-pages
bump