Merge branch 'master', remote branch 'upstream/master'
First convert.
Change extension.
Removed bit of unneeded RDoc stuff at bottom.
Merge pull request #656 from yb66/convert-jp-rdoc-to-md

Convert jp rdoc to md