i18n support #1
Merge pull request #2 from nateriver520/master

i18n support #1