Merge pull request #1 from rogueleader/master

slider