Addresses #124