#21 Fixed
Merge branch 'hotfix/crash_on_resume_activity' into develop