Merge branch 'master' into gh-pages
added min and max sliders
Merge branch 'gh-pages'