improvement
Merge pull request #40 from Yaliang/master

improvement