Added mousewheel capability (optional plugin) and fixed a bug
Merge remote-tracking branch 'origin/master'