Commenting the code (had to be done)
Merge origin/master