Fixed the order of passing client ID "cid" into constructors.
Merge branch 'master' of https://github.com/rbellido/Project