Merge pull request #1 from eyang3/master

Merge