Fix an issue that timer is not canceled
Update dist
Merge branch 'develop'