a bit comment.
v0.9.6
Merge remote-tracking branch 'upstream/master'