Addresses #138