Changed / removed some comments and reordered them.
Merge remote-tracking branch 'origin/master'