Addresses #54