Corrected docs
Merge branch 'bugfixes'