fixed collector
Merge branch 'master' of github.com:franklinyang/MosqTeam1