Merge branch 'develop' v1.0.0