(Issue 814) Rebase with master and touch up documentation