tehn Merge pull request #7 from pq/md_fixes