*more changes on clientSource
Merge pull request #356 from cyrilraja/master

*more changes on clientSource