handle images of different types
Merge branch 'master' of github.com:escherba/warp