(refs #3607) Improve look
Merge pull request #11 from txiki31/1.0-integration

(refs #3607) Improve look