major work
Merge branch 'master' into gh-pages
update
update
readme