Merged pull request and fixed iOS issue