Merge branch 'develop'
Merge tag '1.0' into develop

1.0