Merge pull request #383 from luanmuniz/master

Continuation of the translation
Fixed parametrizing a language that might not exist
Fixed a merge regression with pull request count
Merge pull request #2 from andrew/master

Merge