i18n support
Merge pull request #1 from jlamadrid/i18n

i18n support