added new mda_merge function
fixed test for mda_merge
Merge branch 'master' into 0.0.x-dev