merge changes from readme.org into talk.org