add collector
Merge branch 'master' of git@github.com:monkeychen/simiam.git