Addresses issue #3