height  auto resize
Merge branch 'timeline'