Merge pull request #3 from Blakko/internationalization

alignment with the main project