Very minor refactoring
oups, fixed a bug that I introduced in my refactorization
Merge pull request #53 from JeromeLefebvre/images

JeromeLefebve:images