Merge JingWen and BingXuang part become based code.
Merge pull request #1 from jwchong93/master

Merge JingWen and BingXuan part become based code.