Add smooth scrolling
Merge of master