version 1.0
Merge branch 'develop' into gh-pages
merge branch develop and publish version 1.0