correct documentation / comment errors
Merge pull request #604 from wyhmichael/1.7

correct documentation / comment errors