made changes
Merge pull request #1 from guiltrex/dev/client-id

made changes