Resolve crashlytics issue #58
Merge pull request #103 from barterli/crash/#58

Resolve crashlytics issue #58