Merge tag 'v1.0' into develop

Final version
Merge branch 'develop'