Comments extended.
Merge remote-tracking branch 'github1/master'