Commit 1.2 (Support iPhone 6 and iPhone 6+)