image, improved wiki markup parser