Resolves #192