Merge Stopwatch to Master
Merge Stopwatch to Master