Fixes Issue #295

Added new signals in relation to Issue #295