Merge pull request #50 from everydayhero/md_misc_fixes