merge(upstream)

README.md

@@ -303,7 +303,7 @@ See [godoc reference](https://godoc.org/github.com/h2non/bimg) for detailed API
 
 ## Credits
 
-People who recurrently contributed to improve `bimg` in some or other way.
+People who recurrently contributed to improve `bimg` in some way.
 
 - [John Cupitt](https://github.com/jcupitt)
 - [Yoan Blanc](https://github.com/greut)

resize.go

@@ -118,12 +118,7 @@ func Resize(buf []byte, o Options) ([]byte, error) {
 	}
 
 	// Finally get the resultant buffer
-	buf, err = vipsSave(image, saveOptions)
-	if err != nil {
-		return nil, err
-	}
-
-	return buf, nil
+	return vipsSave(image, saveOptions)
 }
 
 func applyDefaults(o *Options, imageType ImageType) {