Updated docs
Merge branch 'release/0.2.12' into develop