Changes on discussion part
Merge pull request #3 from darribas/master

Changes on discussion part