added: option to enable comments