addied by evan
modified by evan
Merge pull request #1 from tangwsh/master

addied by evan