add some comment
Merge branch 'bug'