Merge changes from loren into master

loren authored
revision 0182538949e3b6d0d69bed22516fdab205d2d6f4
images/cover