edit README
edit README
Merge branch 'develop' into gh-pages