Resolves #215