add test
Merge branch 'master' of github.com:zhangyuheng/subscribe

Conflicts:
	Makefile