Addresses issue #8