Simplify the code
Merge pull request #108 from eldenchen/patch-2

Simplify the code