Merge pull request #19 from coolcsn/master

Please merge my file to the upstream. Auto