Merge pull request #164 from MikePetullo/vips