Merge branch 'master' into develop
start working on 0.2 v
update
update version information
Merge branch 'develop'
Merge branch 'master' into gh-pages