pvictor Merge pull request #65 from FrancoisGuillem/master