Merge pull request #7 from b1151533/update

Update