Resolves #122