Addresses #227