Update to 1.0.0
Merge branch 'master' into dev