Addresses issue #41