updated working copy
Merge pull request #11 from vossgang/matt-copy

updated working copy