inflector fixed version
Merge branch 'feature/infector' into develop