two mode support: Cluster and Session
Merge pull request #16 from dhanuka84/master

two mode support: Cluster and Session