Addresses #122