long to int
Merge pull request #6 from aleml86/master

ClientId change type from int to long. Tested
Merge remote-tracking branch 'upstream/master'