New model
Merge branch 'master' of https://github.com/d3scomp/JDEECo