#29 - ios specific changes