Merge branch 'master', remote-tracking branch 'upstream/master' into new_tags_api
fixed #236 caused by me not resolving conflicts properly before
Internal method to return names of images in IMG_INFO
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'new_tags_api', remote-tracking branch 'upstream/master'