Merge pull request #34 from peterlee0127/master

merge to develop
Merge pull request #35 from peterlee0127/develop

Merge pull request #34 from peterlee0127/master