docs
Merge branch 'nicky-isaacs-rdoc'