Merge pull request #29 from juniwang/dev

merge the latest code on master
Merge remote-tracking branch 'upstream/dev' into dev
UI update
Merge pull request #30 from czx0619/dev

Dev