Merge branch 'hotfix/issue-75-app-shutdown-crash'
fix #77
Merge branch 'hotfix/issue-77-property-injection' into develop