master #10

Closed
Roger.Chen wants to merge 3 commits from <deleted>:master into master