added picture support
fixed merge