Images changes
Merge pull request #556 from tikuf/master

Images changes