Addresses #76