solve 1006_Boring_Commercials
Merge branch 'feature-1006'