Merge pull request #637 from sean-h/master

Add option to include background image when saving as image