Merge pull request #683 from tandasat/master

edit documents and comments