Resolves #121