Merge branch 'master' of https://github.com/abaddon65/simpleImages.git