pull branch to dev
Merge pull request #1 from brian-wzw/bug

pull branch to dev