Resolves #202