few changes
Merge branch 'develop' of https://github.com/tzing/ImgAlign into develop