fixxed injector
Merge branch 'release-0.4.6' into dev