Merge pull request #23 from zpydr/master

pull
prefs scrolling
Merge pull request #24 from zpydr/dev

prefs scrolling