Merge pull request #1 from pjparisien/master

Pull Request