working on docs
Merge branch 'release/1.3'