updated, and fixed typos
Merge pull request #821 from delta48/master

updated, and fixed typos