Simulator done
Merge branch 'master' of https://github.com/Foezjie/imp-simulator