Merge pull request #1 from dingziran/master

test
gcgl2015
Merge pull request #2 from linmouwu/master

2014.10.20