Merge pull request #1 from koshuang/master

New version
Merge pull request #21 from bryantchen16/master

send