Add possibililty to scroll inside a div
Merge branch 'hotfix/1.0.2'