Merge pull request #3 from limbenjamin/master

merge updated code
Merge pull request #5 from yzixuan/master

Merge pull request #3 from limbenjamin/master