support for iPhone6 / 6+
Merge branch 'release/1.0'