Corrected some compilation errors
Merge branch 'master' of https://github.com/ChRis6/circuit-simulation