cambios copy
Merge pull request #26 from makimiller/master

cambios copy