iPad support
Merge branch 'ipad_support'