Minor changes
Using 'shape' instead of width and height
Conversion of images with different pitches