Resolves #195