Merge pull request #2 from mthiele/master

small refactorings we talked about...
some final refactoring in multitouch