2014.10.01
Merge pull request #8 from weilonge/2014.10.01

[W40] Sean - 2014.10.01