Revert "Revert "zjgcd2014""

This reverts commit ae5cfbfbc83635f637d224fa94d5552ea060be23.