Feature/i pad support