Added option to disable/enable scrollbar
Bugfixes