updating regex for short-form client IDs
More flexible regex
Merge pull request #14 from gguuss/master

Updating regex for short-form client IDs