Simplified and updated

Simplified and updated and fixes some errors in the language of
Merge pull request #11 from Yyiyun/patch-2

Simplified and updated