Addresses #73