Change from copy-from to location
Merge pull request #52 from jaypipes/working

Change from copy-from to location