Addresses issue #5.