Merged with changes on Humantech private repository and changed from PIL to Pillow