Merge branch 'master' of https://github.com/RodrigoSotero/DisPaper.git