modify file names
Update README.rdoc
Merge branch 'master' into Email