Resolved build issues with variable name mismatch, added in if statement to catch terminated child processes
Merge branch 'master' into wip for ex2 completion and ex3 updates.