Merge pull request #174 from CruGlobal/slider-fix

Slider fix
Merge branch 'dev' into slider-fix