Close #32, add image-export
Fix conflict