fixed a crash described in issue #11 on crashlytics
fixed crash described in DEV-20394
Merge branch 'feature/bugfixes' into dev