Addresses issue #44