Basic optimization of circuit simulation calculation
Merge remote-tracking branch 'origin/master'