Fixed merge issue
Merge branch 'master' of https://github.com/superxiao/dmprj