add type to function and signal
Merge remote-tracking branch 'origin/master'