modified to use pillow rather than PIL
Merge branch 'devel'

changes to use pillow rather than PIL