Fixed for iPhone
Merge branch 'master' of github.com:capshaw/capshaw.github.com