Added docs
Merge branch 'release/1.0' into dev