merge with the latest master branch

fixed some grammar problems as Jeff's review comment.