Addresses issue #26.
Addresses issue #27.