mod a bit to be ios specific
Merge branch 'master' of https://github.com/tim333/silly