Addresses issue #80