[W46] yifan: 11/10 - 11/14
Merge pull request #44 from begeeben/yifan

[W46] yifan: 11/10 - 11/14