Merge pull request #82 from michaelnsj/cluster

Merged
Merge pull request #83 from michaelnsj/cluster

Merged.
fix one bug