Closes #1195, and fixes path issue for images.