Make it work with iOS 8

+ removed yunnix' whitespace changes for clarity