Addresses #186