- Multiple injection interface changed to be more flexible.
- Version output simplified.
Merge remote-tracking branch 'origin/master'