Added localization and some fixes
Merge pull request #1 from rafaelfunchal/master

Added localization and some fixes