Merge branch 'master' into ndynan
Changed scroller to allow desktop events
Merge pull request #16 from ndynan-gp/ndynan

Ndynan