added feature & update
Merge branch 'master' into img2ij