Added licensing information.
Simple modifications.
Merge branch 'image_transfer' into develop