changin variables
Merge branch 'master' of http://github.com/mrempala/sim-comp
thread part a