Addresses #136