Fr tr (first part)
Merge pull request #328 from philmassart/master

Fr tr (first part)