Merge pull request #1 from chukong/master

Master