Merge pull request #628 from cpavanrun/master