Addresses #106