Added some options to image extraction code. Preparing to move to another repository