Fix bug that does not work on Android and iOS
Version 1.0.1
Merge branch 'release/v1.0.1' into develop