Closes #45 - image files now actually get returned!