Resolves #194