Merge pull request #373 from glynnc/master

Change handling of background and shadow color