Working on slider.
Working on slider.
Merge remote-tracking branch 'origin/master'