reset button working
Merge branch 'master' into reset-button