Merge pull request #2 from layman00/master

xx