Merge pull request #1 from davidaparicio/master

"Add the simulator source"