Merge pull request #21 from mind1master/master

Cluster client