Addresses #117