davidm Merge pull request #2 from craigbarnes/markdown