Merge branch 'carousel_simpler'
Merge branch 'master' of https://github.com/walidvb/lezoo