Merge pull request #1 from layman00/master

gggg