Merge branch 'gh-pages'
undo changes
test
test new method
Merge branch 'master' into gh-pages