Added branch due to iPad difficulties.
Merging.