Addresses Issue #1 and Issue #6.