fr tr
Merge pull request #414 from philmassart/master

fr tr