Issue #14: Branch Iss14 complete.

Issue #14 was completed. It is now ready to merge into the main branch.