Merge pull request #34 from peterlee0127/master

merge to develop