Merge pull request #687 from ssokolow/master

Signing the CLA