slideshow improvements
slideshow improvements
Merge remote-tracking branch 'github/master'