Merge branch 'develop' of github.com:iJoeCollins/JOESlider into develop