Merge pull request #1 from Tabouret/philibert

Philibert
Merge pull request #2 from Tabouret/master

Merge pull request #1 from Tabouret/philibert