Introduce child injectors
Merge branch 'master' into child-injectors

Conflicts:
	injector_test.py
Add missing documentation and tune code a bit
Merge pull request #12 from jstasiak/child-injectors

Introduce child injectors.