iphone compatibility
Merge branch 'master' of https://github.com/joemercer/waitless