Merge branch 'master' of https://github.com/TheBlueFrog/ec-sim