Merge pull request #5 from borchert/rewrite

fix md arg
fix typos, general clean up