Support 5, 10 and 90sec CM in addition to 15, 30 and 60.
Fix bug on logo detection.
Fix build break.