Fix bug with scrolling.
Change version to 0.6.1.
Merge branch 'release/0.6.1'