Merge pull request #1 from veronicastraszh/veronica

removed spurious copy/move stuff
Merge branch 'master' into veronica