Resolves #140