Change comment layout as it was affecting commands
Merge remote-tracking branch 'origin/master'