markdown parsing
Merge branch 'ray'