Merge pull request #1 from wc351/master

Update1