Fixed null JSON object bug when there is no image.
Fixed bug in file finder.
Merge origin/master