Addresses #135