Addresses #137