Merge pull request #353 from cyrilraja/master

*Fixed null pointer exception while delete collection
*more changes on clientSource