Resolves #186