owen-carter translating
Merge pull request #1209 from owen-carter/master

owen-carter translating