ticket:10 edit signal
Merge branch 't10_signals'