Addresses issue #88