adding some text support
merge master -> issue64
better handles images
added some more text support
merged in fix of issue 64