Revert "pull request 2014.09.09"
Merge pull request #2 from wwwcragoncn/revert-1-master

pull request 2014.09.09