Resolves #200