Revert "Bugfix in the reset function"

This reverts commit c223bab4c488b4b286d1e284887eea55ffb80495.
Bugfix in the reset function
Merge branch 'master' into gh-pages