Copy clean-up
Merge pull request #38 from cottonpaul/master

Copy clean-up