Resolves #131