Touch support
Merge pull request #1 from SINTEF-9012/master

Touch support