added reset feature
getting ready for merge to gh-pages
getting ready for merge from master