New factory for loading scenario from file
Fix indentation
Merge pull request #102 from javierhe/master

New factory for loading scenario from file