Commit 12/08/2014

Various image fixes