Merge pull request #301 from BoivinBenoit/master