fix typo
Merge branch 'develop'
support reset()