fr tr
Merge pull request #386 from philmassart/master

fr tr