update listener/control class
Merge remote-tracking branch 'origin/master'

Conflicts:
	c3plot.py