Simplified and updates
Merge pull request #10 from Yyiyun/patch-1

Simplified and updates