Pass signals info as kwargs
Merge branch 'signals' into 'master'