'Escape ampersand' fix

Thanks to Bryan Harley for the help and 'Escape ampersand' fix

Also cleaned up code and removed the leftover 'image' code.
Readme description added