Addresses #67