Feature/xcode6 ios8 support