switch cases
adjusted reset function
Merge branch 'refs/heads/reset-function' into gh-pages