fix language and order
Merge branch 'master' of git://github.com/Tapioca/Client-php