translation
Merge pull request #172 from avelino/master

translation