Fixed an issue with image height.  Fixed an issue with words containing an underscore