Merge pull request #34 from vossgang/matt-copy

Matt copy
fixed timeline