Fixed ipad bugs vooral
Merge remote-tracking branch 'upstream/master'
Fixed bugs
Merge pull request #49 from bram-sm72/master

Pull request iPad bug fixes
Merge pull request #50 from jorisvervuurt/master

Fixed issues.