NOJIRA - Fix enter
Merge pull request #975 from christianv/fixenter

NOJIRA - Fix enter + optimize images