Initial implementation from the injectoR split
Merge pull request #1 from lev-kuznetsov/master

Initial implementation from the injectoR split