small changes and testing method
added eraser
Merge branch 'master' into gh-pages