Merge pull request #2 from vossgang/matt-copy

Matt copy
Merge pull request #3 from vossgang/matt-copy

merge
refactor