Merge pull request #377 from glynnc/master

Picture fixes