fix
Merge branch '3.2/master' of https://github.com/ener/image into 3.2/master