Minor formatting changes.
Setting to only keep one image in memory at a time.

Loads images twice, but makes only a very small difference in execution time, so enabled by default.
Merge branch 'origin/master'
Merge branch 'origin/master'