added autowired properties
Merge branch 'autowire' into develop