Merge pull request #818 from narfbg/develop-image-lib

Improve the Image manipulation library