gan's first commit
Merge pull request #1 from g2point0/master

gan's first commit