fix #77
Merge branch 'hotfix/issue-77-property-injection'