Merge branch 'dev'
Merge branch 'dev'
Fixed requirements
Merge branch 'dev'
Switching simulations after simulation finished