Add more control on return
Merge branch 'digitaleconf' of github.com:serenity/twtcst into digitaleconf

Conflicts:
	src/filter.coffee