Simulator and other fixes
Merge pull request #10 from DiegoAmezquita/Simulador

Simulator and other fixes