Simulation update
Merge branch 'newgen-kit' of https://github.com/d3scomp/JDEECo.git into newgen-kit