Changed some comments after a merge with victorolinasc/elineuron/master