BugFix: use class name in selector, not the element-name
Merge branch 'storytelling'