Merge pull request #1 from pjparisien/master

Pull Request
Merge pull request #1 from gtupak/master

Merge pull request #1 from pjparisien/master