Request to merge new documentation changes

The code in this branch fixes #5.