Merge branch 'make_md' into devel
clear trash
Merge branch 'devel'