Merge pull request #450 from bitwangyaoyao:2.4_dft