Merge pull request #3 from WOYM/master

Update