Addresses #51