[W41] Luke: 10/6 - 10/9
Merge pull request #14 from luke-chang/1006

[W41] Luke: 10/6 - 10/9