new way to handle images
Merge pull request #1398 from diegosarmentero/master

new way to handle images