Resolves #214