Merge pull request #6 from caseyg1204/master

fixed merge issues
return 100 images