Updated moar stuff
Merge branch 'master' of https://github.com/mrempala/sim-comp