Few changes
Merge branch 'master' of https://github.com/epinhao/Tesis.git