Merge pull request #59 from jacobwagner/master

vips