Merge pull request #21 from everydayhero/md_general_improvements