Might fix #360 wasn't really an issue with injection but a bad development pattern
Merge branch 'master' of https://github.com/appsgate2015/appsgate