Merge pull request #628 from bitwangyaoyao:2.4_fixMoments