Made simulator level-independent
Merge remote-tracking branch 'origin/master'