Adding better injection support
Merge pull request #33 from webspinner/master

Adding better injection support