Fixes #2
Merge branch 'develop' of https://github.com/marvinlabs/android-slideshow-widget into develop