merging branches
merging branches
merging branches
Revised client comm module
Merging with andrew's branch.