Resolves #101