Merge pull request #115 from kazoompa/localization

Localization