upstream changes from _s -> image.php fixes
Merge pull request #14 from bradp/master

upstream changes - image.php changes