added reset button function
Merge branch 'devel'