chens: 10/13 - 10/17
Merge pull request #20 from shamenchens/Oct13-Oct17

[W42] chens: 10/13 - 10/17