Adds documentation for Issue #20

This merge cleans up the merge from the previous merge conflicts, and adds documentation to finish off Issue #20.