Fix GitHub issue #3
Fix Crashlytics #4