merging back from afnetworking