Add image move support (cleaner pull request)

Made a new branch and PR for #819.