Merge pull request #29 from juancjara/development

Development
simulation preview
xurrebug
Merge pull request #31 from juancjara/master

update dev