Added suport for injection in handlers, ready for inspection and merge.
Merge remote-tracking branch 'origin/issue-88'