Merge pull request #27 from jbaruch/master

copy and move improvements