[W47] Luke: 11/17 - 11/21
Merge pull request #52 from luke-chang/1117

[W47] Luke: 11/17 - 11/21