Adding comments, and cleaning things.
Merge remote-tracking branch 'origin/master'
Correcting identation.