[W47] Sean Lee: 11/17 - 11/21
Merge pull request #51 from weilonge/W47_1117_1121

[W47] Sean Lee: 11/17 - 11/21