Actually support transparency in images
Merge