Resolves #199