Simplify clientIdGenerator implementation.
Merge pull request #9 from quickleft/use_token_generator_library

Simplify clientIdGenerator implementation.