Merge pull request #162 from avelino/master

fix show fields
Merge pull request #163 from avelino/master

i18n and fixes