Merge pull request #1 from SteveKChiu/master

Update