Bug fixes + iphone 6 & 6 plus support