added support for sources when handling an action
Merge branch 'addSourceSupport'
developing for version 1.1