Commented invalid code
Merged branch gabriel into master