ticket:10 fixes
Merge branch 't10_signals'.New fixes.