#12 fix some bug and crop image