Addresses issue #2.