Merge pull request #4 from LCTT/master

2014.9.27
Merge pull request #1811 from 2q1w2007/master

Merge pull request #4 from LCTT/master