fix some bugs
Merge pull request #94 from michaelnsj/cluster

Merged.