merge code in ios branch to master