Merge pull request #379 from glynnc/master

Picture fixes