[W50] yifan: 12/08 - 12/12
Merge pull request #65 from begeeben/yifan

[W50] yifan: 12/08 - 12/12