Merge branch 'master' into slider
Merge pull request #64 from bchiatt/slider

Slider