Supervisor now stops when done; Stop time added to output
Merge remote-tracking branch 'origin/master'