Reset cluster numbers.
Add performance tracking
Merge pull request #11 from ivanzhaowy/master

Merge