Merge #16 problems running simulation with master #20

Closed sepr88 closed 5 years ago