Added simulation, and other changes.
Merge branch 'master' of https://github.com/jonatanfm/tfg