merged back update on ios #65