ipad
Merge pull request #2 from joyh/master

iPad