Finish 1.0.0
Merge branch 'develop'
Merge branch 'master'