Fix GitHub issue #3
Merge branch 'development'
Fix Crashlytics #4
Fix Crashlytics 5.
Merge branch 'development'