Merge pull request #1 from jjaspe/carousel

Carousel
Merge branch 'carousel'
Merge branch 'master' into carousel