Changed from rdoc to md, and improved