Fixed, imporved, polished, i18nzed module.
Merge pull request #4 from roadster31/polish

Fixed, improved, polished, i18nzed module.