Merge "Updated programming guide for image-scaling-and-fitting" into devel/master