Small rewrite of the rebase PR
Merge pull request #7 from NelleV/rebase_doc

Small rewrite of the rebase PR