Better support for touch devices (#2)