refactor images
Merge pull request #21 from vdaubry/refactor-image

refactor images