added new classes
Merge branch 'master' of https://github.com/simnale/simulator