Package upgrades
Client id bug fix
Merge pull request #129 from jembi/fixes

Fixes