Resolves #117