Merge branch 'develop' into release
Merge branch 'master' into release
Merge branch 'master' into release
StopWatch : struct -> class