adding siddhi context
adding exceptions
adding executors
removing TODO
Merge remote-tracking branch 'origin/master'