Merge Sama's Changes

More images!