Addresses #60