update from CocoaChina20140606

update from CocoaChina20140606