Split nr_of_images parameter into two: min_images and max_images.
Merge branch 'master' of https://github.com/tambetm/fotis