update comment according to code
Merge branch 'testing' into 1.1.0