Ref #16 - Second pass on documentation