It closes #12 for android
Fixed #12 for iOS