Revert "Revert "tiantianhao_2014-10-3 20:06""

This reverts commit 109a5e66be23d8c11fc4cd6a4e62e470658f1a9e.