update from CocoaChina20140617

update from CocoaChina20140617