Resolves #158