Updated to v1.0.0
Merge branch 'develop'