Sync your version with ours

* Add support for touch/mouse wheel devices
* Update comments