Addresses issue #25