Add touch support, fix #2