fixed timeline
Merge remote-tracking branch 'origin/master'
Merge pull request #36 from vossgang/matt-copy

Matt copy