Merge branch 'carousel-style'

/cc #141