First cut
Merge pull request #1 from thibault-duchemin/Tim

First cut