Merge branch 'dev1'
Slider 0.0.3