polish
add new option -c
Merge branch 'master' into testing

Conflicts:
	broadcast_recorder.py