Moved stats collector to its own class
Merge branch 'master' of http://github.com/kshmir/ss-2013